Rename defs to entity_models. Simplify Jinja rendering #232
+101
−287
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gilesknap
added a commit
that referenced
this pull request
Jun 18, 2024
* rename definition to entity_model * test_list working * all tests passing * lint * remove redundant changes * revert id_to_entity changes
GDYendell
reviewed
Jun 18, 2024
| @@ -17,7 +17,7 @@ | |||
| ] | |||
|
|
|||
|
|
|||
| class DefinesTypes(Enum): | |||
| class DefineTypes(Enum): | |||
There was a problem hiding this comment.
I think this still has one too many ss
GDYendell
reviewed
Jun 18, 2024
| @@ -54,60 +55,69 @@ class Entity(BaseSettings): | |||
| entity_enabled: bool = Field( | |||
| description="enable or disable this entity instance", default=True | |||
| ) | |||
| __definition__: EntityDefinition | |||
| __definition__: EntityModel | |||
There was a problem hiding this comment.
This field should probably have a new name too
There was a problem hiding this comment.
I'm not getting you - that is the new name we settled on
gilesknap
added a commit
that referenced
this pull request
Jun 19, 2024
* make args and defines lists into dicts * rename Args to Params * first version of support yaml converter * completed converter * fixes to get tests working with list2dict * remove redundant dlsPLC expansion test * convert all support yaml to new schema * restore incorrect test output samples * fix id lookup issue * fix remaining tests * tidy formatting in converter * add __utils__ conversion for support and ioc yaml * add old samples to gitignore for testing * improve error reporting in converter * Rename defs to entity_models. Simplify Jinja rendering (#232) * rename definition to entity_model * test_list working * all tests passing * lint * remove redundant changes * revert id_to_entity changes * name changes "parameters" "entity_models" * update support schema * make args and defines lists into dicts * rename Args to Params * first version of support yaml converter * completed converter * fixes to get tests working with list2dict * remove redundant dlsPLC expansion test * convert all support yaml to new schema * restore incorrect test output samples * fix id lookup issue * fix remaining tests * tidy formatting in converter * add __utils__ conversion for support and ioc yaml * add old samples to gitignore for testing * improve error reporting in converter * Rename defs to entity_models. Simplify Jinja rendering (#232) * rename definition to entity_model * test_list working * all tests passing * lint * remove redundant changes * revert id_to_entity changes * name changes "parameters" "entity_models" * update support schema * tidy comments * replace "definition" with "model" throughout * fix system test * arg --> param * DefineTypes -> DefineType * Update src/ibek/entity_model.py Co-authored-by: Gary Yendell <gary.yendell@diamond.ac.uk> * Update src/ibek/ioc.py Co-authored-by: Gary Yendell <gary.yendell@diamond.ac.uk> * arg --> param again * error on no id in Entity.__str__ * Update src/ibek/entity_model.py Co-authored-by: Gary Yendell <gary.yendell@diamond.ac.uk> * clarify ID and _get_id_arg * update ibek2to3 header comment --------- Co-authored-by: Gary Yendell <gary.yendell@diamond.ac.uk>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.